# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1069.52.1 -> 1.1069.52.2
#	        fs/Config.in	1.28    -> 1.28.1.1
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/09	bjorn.helgaas@hp.com	1.1069.52.2
# fs/Config.in: Fix merge errors.
# --------------------------------------------
#
diff -Nru a/fs/Config.in b/fs/Config.in
--- a/fs/Config.in	Thu Oct  9 15:19:46 2003
+++ b/fs/Config.in	Thu Oct  9 15:19:46 2003
@@ -55,7 +55,7 @@
 define_bool CONFIG_RAMFS y
 
 bool 'HugeTLB file system support' CONFIG_HUGETLBFS
-if [ "$CONFIG_HUGETLBFS" = "y" ]; then
+if [ "$CONFIG_HUGETLBFS" = "y" ] ; then
 	define_bool CONFIG_HUGETLB_PAGE y
 else
 	define_bool CONFIG_HUGETLB_PAGE n
@@ -90,7 +90,6 @@
 fi
 dep_bool '  Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS
 dep_bool '  Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS
-fi
 
 # It compiles as a module for testing only.  It should not be used
 # as a module in general.  If we make this "tristate", a bunch of people